#472 Added missing space
#472 Reorganized methods in order of visibility and also the chance that they are called from outside.