Added more commands and reformatted code