Refactored some sections into multiple smaller sections