refactoring to doubles, cleaning up