A bit of cleanup. Need more inspiration! or graphics