Fixed all comments by @rubenk