Clean up some clutter and organize