code cleanup and unification
1 file changed