Finished

Clean up and finished result