Finished cleaning up. More features coming!