Move comments
More restyling