Refactor: Cleaned up code