Small changes - organizing the code