Updated the software side to be a bit cleaner