Added debug build option and cleaned up indentation