Removed unused func, comment & formatting cleanup