Stick to one class per file
Fix basic code formatting issues