More standardization with spacing/comments

[ ENHANCEMENT ]  Add separators and get rid of overly verbose comments