Cleaned up Code

cleaned code