Updated spring data
Cleaned up code + aplied some kiss