Before clean up
Code clenup