diff --git a/scanner/scanner.go b/scanner/scanner.go
index 5e3a466..7b3d30d 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -42,7 +42,7 @@ func NewScanner(fileName string) Scanner {
 }
 
 // creates a scanner.Token struct with kind, position, value, line and appends it to the scanner.Scanner.tokens array
-func (s *Scanner) addToken(kind TokenKind, value string) {
+func (s *Scanner) addToken(kind uint, value string) {
 	s.tokens = append(s.tokens, Token{
 		Pos:   s.linePos,
 		Kind:  kind,
@@ -68,11 +68,6 @@ func (s *Scanner) PrintTokens() {
 	}
 }
 
-// getter for scanner.Scanner.isAtEnd
-func (s *Scanner) atEnd() bool {
-	return s.isAtEnd
-}
-
 // increments s.linePos by one and assigns the next char to s.curChar
 func (s *Scanner) advance() {
 	if s.linePos+1 >= uint(len(s.curLine)) {
@@ -108,7 +103,7 @@ func (s *Scanner) advanceLine() {
 // parses the file given to the Scanner line by line
 func (s *Scanner) Parse() {
 	startTime := time.Now()
-	for !s.atEnd() {
+	for !s.isAtEnd {
 		switch s.curChar {
 		case '#':
 			s.addToken(HASH, "")
diff --git a/scanner/tokens.go b/scanner/tokens.go
index 1e25ecc..ece52df 100644
--- a/scanner/tokens.go
+++ b/scanner/tokens.go
@@ -1,10 +1,8 @@
 package scanner
 
-type TokenKind uint
-
 type Token struct {
 	Pos   uint
-	Kind  TokenKind
+	Kind  uint
 	Line  uint
 	Value string
 }
@@ -25,7 +23,7 @@ const (
 	EMPTYLINE
 )
 
-var TOKEN_LOOKUP_MAP = map[TokenKind]string{
+var TOKEN_LOOKUP_MAP = map[uint]string{
 	HASH:               "HASH",
 	UNDERSCORE:         "UNDERSCORE",
 	STAR:               "STAR",