Populating documentation & refactoring Blocks