Update/organize code in general