Fixed code alignment
Removed unused references to core.jar