code cleanup and file rename