Better names and cleanup