Code refactor done durring meeting on 2012-02-18