Refactored
cleanup