[DEV] some code writing rework