Some code cleanup to provide better readability and shorter lines