Code Pro fixes

Unnecessary imports, documentation, renaming
kpmartin quan1992