Updating code

After talking his friend about simplifying my code he gave some suggestions I am now implementing this is the link to my new code. It is still a work in progress and later on will be more simplified.