Updated objectives;
Code clean-up;