Cleand up code