Updated

Added Sources, code cosmetics