Removed some debug lines and added comments