Some Very basic fix.. clean code base