cleaned source code up