Complete functionality
Clean up whitespace