Fixed namespace for subjects (IntelliJ messes them up when moving files around)
Some small formatting