refactored for spacing issues