code style and small features