alpha ~ 0.55.5

+ Small code readibility changes