Fixed comments, formatting