Last week Fixes

Fixed Last week's code according to standards and recomendations