Fixed issues and refactored