styling changes, comments integrated and more