Update Page-level DocBlocks and fix warnings
Code cleanup