Some Suggestions for Cleaner Code

Very nice!!!!!!!!!!