added comments + cleanup