#55 refactor, delete commented code