Remove hardcoded main class
Fix spacing