cleaning up code...

shortening some long lines, etc