Improved code quality by applying WET (opposite of DRY :D)