Essential functionality completed
Code functionality complete
code cleaned