Removed all /**/ since deemed unnecessary