Style update / Bug Fix

Updated style and fixed bug in Review