Cleaned a couple bits up