Minor fixes

Code cleanup, code mess-up,