Update

Made a few simple changes to clean up appearance and simplify the code.