General Code Cleanup

Indent code, remove leftovers from JDGui