cleanup code a bit (IMHO) [ 0.2.3 ]