Cleaned stuff up, move things around