cleaning up warnings and removed comments.