Minor changes on types and readbility