Code and import organize and cleanup