cleaned up old lines and added comments