Fixed indentation, and cleaned up source files