added extras and updated code style