Fix grounded bug and make code cleaner/more readable