Cleaned up code an change some stuff to afhere to my preferences.