comments added
unused lines removed