Fix/code cleanup