Cleaned up the mess a little