Cleaned up whitespace and debugging code. Added additional argument annotations to clone method