Code cleanup

All code should be in function expression