reverting some manual edits back to how it was on stackexchange
removing redundant commented out code