Cleaned up Java src