[#31] Fix for "[Code smell] Shorter lines are much easier to read."