Bic cleanup

Do not iterate on lists with one element
Remove unused methods
Avoid duplicate code
PEP8