Clean up and looking nicer