Some formatting and added definitions