Cleanup and better formatting