Edited TARGET for debug and release & coding style