cleaning up the source code - reverted to Eclipse IDE for now