removed extra content and refactored