Refactoring done - Removed par. Makes it slow(er). Made scaladoc work.