removed comments and reformatted optimization fix