refactoring

whitespace and removing deprecated functions