Cleaned stuff up a little bit