Added missing brakes
Fixed package declarations and made some field final