some cleanup of the code

from the now on the development to be done under the cental account