Refactor comments, css changes