Fixed bug, updated formatting