code cleanup + mvc rename