Quick clean up and refactor