code clean ups and renaming