CS-4921: Fixes some indentation errors and adds more clear docblocks