line-saving and code cleanup based on @dpshelio suggestions.