Fixed and organized a few things