cleaned up docs, shortened vars, ready to submit