Style fixes, added comments