further clean things up because i am a perfectionist