[READY] Refactor comments

Move comments above the line, fix typos etc.