Update formatting and include javados