Clean up some, more coooddeeezzz