Some minor changes

I made some minor changes for a better performance and design. I hope accept it. 

I made only some minor things because I was bored. If you want, I can continue this and help you with some issues.