Added constants, cleaned comments.