Cleaned up Code

Just clean up