Removed duplicate code by require_relative