cleanup
added changes
fixed capitlization issues