refactor

Just a few changes to keep the codebase clean.