added oxygen comments and removed magic variables