fixed comments, removed empty lines