gutting out meaningless wrappers & refactoring styles