Improve client-side requiring

- Improve codestyle
- Remove '@' resolving
- Improve rerror reporting