Code cleanup, naming