Use spaces
Refactor calendar controller
merge refactoring