Style

final style with tested functionality