Comments and console logs cleaned up.