Fixes to comment section & Style