Cleaning up with the basics setup