Code and file cleanup