Finishing up a few more methods, cleaning up