Cleaned up formatting, added comments
Split out the importing classes to a seperate script