cleaned up the code :wq