Fixed comments and cleaned code