Moved parsing functions to a class, tested the program again, made some minor aesthetic corrections in source code