Clean up indentation, dependencies and file permissions