MOre cleanup, making this project elegant.