Cleaned up code...feels so good