Fix/cleanup

Fix/cleanup