Attempt to fix null exception, cleanup comments