some cleanning up for better code