Documented code, refactor code that Daniel took credit for :)