Removed useless comments + streamlines code

put some sommands after for or if