Cleaned imports and doc comments