Some cleanup and refactor