Some Code cleaning doen