Cleaned up dependencies and coding standards