Some more code style updates + Removed some redundant code, such as the ServiceProvider use statement.