Cleaned up the code a bit, added a program version indicator