Edited comments, added logging, removed onCommand