Cleaned up code

Less static methods, clean up for GUI implementation