removed unused code, indented markup