Made classes nicer to read