Cleaned code a little bit and added comment #14