Removed more System.outs and adjust spacing styling

AFDP-31