Feature/codereview fixes