Fixed formating and use proper commenting