Implemented more mandatory user stories + cleanup