Cleaned up yay!