minor tweaks
cleanup from xcode analyzation