Add Comments and refactor imports