Code analysis

#51