Clean Code

Clean up Code