General cleanup, naming