cosmetic changes
validation - not finished