cleaned-up comments and removed unused lines