code clean closes #5