capitalization issues, cleaning up