Code cleanup

new dev version