trying to improve code formatting