removed useless comments and jalopy