Cleaned up whitespace and updated import statements