Indentation and Pagination fixes