Style fixes and added relevant commnets