code refactoring & inspections. Clean Up. final commit (w/o comments)