Refactoring

Date: March 13th, 2013