a lot of refactoring to achieve syntax uniformity

Signed-off-by: Tolga HOŞGÖR <fasdfasdas@gmail.com>