#254 following code convensions