Cleaned Up Some Code

clean up some code here and there