Quick fix to remove unnessesary comments, removed static init block, and
fix to bug in system.out test