Clean up

Still need to be cleaner