Some tweaks and file cleanup