Updated comments blocks
Updated codestyle