formatting changes and refactoring lease sections to have init() methods