general refactoring

remove warnings
eliminate unused code
fix code to follow naming convention
reformat cukes