Cleaning code
Including more specs