removed some comments and styling