Refactored package, paragraph indentation