Applying pr comments and fixing silly mistakes