Removed test/demo java files
Fixed indentation