Clean up, consistency & keep it simple