Code is cleaned up. Top view is now in a better place.